From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 12 Feb 2024 11:13:17 +0000 (+0100)
Subject: tools/toolbox: Include subprojects in meson-build --dist
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~226^2^2~142
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ea4f859547717057329e999be4b6d42637ed2bd6;p=gnome-shell.git

tools/toolbox: Include subprojects in meson-build --dist

The main use of the --dist flag is as a fallback when the CI
dist job doesn't work for some reason. The gnome-shell tarball
now needs the --include-subprojects flag, and it doesn't hurt
for mutter/gnome-shell-extensions, so just add it when --dist
is specified.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3164>
---

diff --git a/tools/toolbox/meson-build.sh b/tools/toolbox/meson-build.sh
index 32ff10643..fc17cb70e 100755
--- a/tools/toolbox/meson-build.sh
+++ b/tools/toolbox/meson-build.sh
@@ -103,7 +103,7 @@ done
 find_toplevel
 
 BUILD_DIR=build-$TOOLBOX
-[[ $RUN_DIST ]] && DIST="meson dist -C $BUILD_DIR" || DIST=:
+[[ $RUN_DIST ]] && DIST="meson dist -C $BUILD_DIR --include-subprojects" || DIST=:
 
 needs_reconfigure && RECONFIGURE=--reconfigure